View and style edits
Merge fix