Fixed some issues with UI