Form alignment update

Closes #167