Add pretty form output and dropdown handling