Revert "Revert "UI layout for questions""

This reverts commit eaa1ccb8cfedca403f25a5f48eb5ddf307fcaedf.