Worked on layout and buttons