Refactored views

Views rewritten/reformatted with consistent style and syntax.