Work on correctly hiding/showing form elements [MJ-131]