Clean up views, make them more functional