fixed cols layout
Merge branch 'develop' into move-user-info
Merge pull request #188 from xliiv/move-user-info

Fixed 2 columns layout in forms