add more css
adjust layout
commit confict