Improve form layout - vertical and not horizontal