edited problem form, and merged layouts
Merge branch 'refactorAdmin' of github.com:rkrdo/sepap2 into refactorAdmin