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