17-12 fix layout

17-12 fix layout