redesign layout
improve layout, check README notes at 12/05/2014