Made cups prettier, modeled after sam