layout and buttons changed