Fixed spacing/text align issues