re-work question layout