Consolidate forms and add show comments feature