Use ActiveSupport::Concern to avoid fat models
Fix layout issues