new design
some lining up
Merge pull request #1 from jeremiak/new

New