Added compact view and flag; Minor tweaks and cleanup