Major improvements in the UI

Fixed some bugs