Updated Button Layouts