Form tweaks

Lining fields and buttons together.