Add clearbutton functionality
Layout and design changes