Changed the UI around. Fixed bugs