Style devise pages
Fixed merge conflicts