changed validation, added menu and view methods
changed unit test