V0.2 : introduice icons on buttons and a bit of code clean-up.