changed the conditionals of the links from devise
fixed merge conflicts in application css