Added event bus and tidied up views and their resources.