more layout progress, and also moved all facets loading to application_controller.rb