Refactored /views. TODO: Remove dead code