Changed the UI structure