Fix border, replace menus with buttons, initial resume capability