new design

merge new design to master

fix this
fix that
fix the other