Cleanup of various views and layouts