Changes in the UI

Fixed the UI related bugs