Validation enabled

Also includes initial hide/display elements based on user selection