Added Transaction validation and cleaned up some form stuff