Cleaning up styles, major overhaul.