Fix showForm functionality to be cleaner