design fixes
Merge pull request #19 from artkirienko/design_fixes

design fixes