Cleaning up views
Merge with Bryan's styles