updates to setup views to clean up config/rspec vars, updates to Site Form