Fixing some % margin bugs, darken coffee