Updated with buttons and css