fix layout and button