View and style fixes