view and style cleanups