Refreshed and fixed the design
Merge pull request #20 from marko91/master

Refreshed and fixed the design