cleanup code and markup and re-introduce checkboxes for files to commit, and move then into floating form