Buttons + Main menu + Overall cleanup