Added buttons, cleaned up interface