fix layout and buttons