Minor ui changes, added additional fields