Some basic UI fixes with the buttons