Revert "Issues #416 (small UI fix) and #453 (mask validation)"
Merge pull request #484 from olga-jane/revert-474-Settings

Revert "Issues #416 (small UI fix) and #453 (mask validation)"