Spell Checked and minor layout changes - INCOMPLETE