fixed menu and button implementation