changed around the layout of questions a bit and removed pa hodet
Revert "changed around the layout of questions a bit and removed pa hodet"

This reverts commit 06e64ab3b2a7e228d2e5c079ef1329a74d027080.
Revert "Revert "changed around the layout of questions a bit and removed pa hodet""

This reverts commit 816b703a1cf73fa327b0a3ebded0ac2727200a40.
updated tests as well