Updated popover to have a cancel button, no color palette stuff yet