Preference layout complete
Minor additions to validity checking

Issue #10
Issue #39