Fix/front end validation

Fix fix fix