Changed UI for better usability