fix answer layout refactor