Added subheader view for optional display and made minor bug/layout fixes