Some views and style fixes