Update: refactor coffee; cleanup homepage