Fixes #14 and also improves form layout a bit