New layout and buttons