Include gallery view and content types
Update styles to combat changes
Manual merge