rearranged coffee organization; minor popover improvements