Polish
Merge pull request #1 from systemride/master

Merge for new design.