fix buttons, lists, layout