A few more UI fixes.
A few more updates to the form