Clean up views and layout