More work on input validation, use classes to switch styles