Some improved styling