New layout and added buttons