fix button placement
fix merge conflicts in application.css
fix merge conflicts in application.css