FormCompleteData class and some half assed admin UI changes