Clean up menu tab views and logic