added ability to select what columns get displayed
fixed form