form fixes and alignment
Merge branch 'hotfix/1.0.5' into develop
final form buttons fix hopefully