Add more validation to screens.