started refactoring layouts and view.clj