New UI changes
Merge pull request #207 from thomasalrin/0.5

New UI changes