UI design changes. Removed unnecessary elements