Some cleanup; Tried to add CSS, but I failed