Re-Factoring and some Tests
Text validated, size and font changed.