Reverted change that caused buttons to lose their reference to the main view.