Fixing up the UI of the forms