Refactored views, planning on setting up events