Add missing CSS classes
Cosmetic changes
Layout changes