Enhanced the kogin screen and expense form
merge conflicts