cleaning up views for better nav