Implement menu toggle in a better way