Cleaned up view code and button toggle-states