clean up styles and re-arrange some stuff.