Changes

Mostly work on the tabs and layout of the form.