Fixed up and improved commit logic as well as DB retrieval into forms