Fixed positioning for different form elements

Closes #740

Also minor style fixes duo to different positoning updates.