Some refactoring in the UI
Version 0.9.5