Added some styling to pages
Fixed merge conflict on labels