Fixed some bugs with UI.

App is working smoothly