New design

merge with master.