Fix-up, plus some css