Some SMART state popover representation tweaks