Added uber modal popover.
Fixed bugs with reviewing.
Fixed merge conflict.