Fixed text alignment/margin/padding bugs

A couple margin/padding/text-align fixes from https://docs.google.com/spreadsheet/ccc?key=0ArvuSYeGW6GpdFRBZVNtSHZfM3dkVTZiMjRKLURmOXc&usp=sharing#gid=0