Clean up and compact view enabling