Brighter design

Close #44