UI changes

New UI implemented