added background photo options
fixed small application.css merge conflict