Refactored popover | added more options and made it more modular | More options on next checkin