updated menu and button stuff