Minor changes, listener for switching main view added