some design improvements + local imge bug fixed
Merge pull request #38 from PassioEtDesiderium/master

some design improvements + local image bug fixed