Cosmetic fixes
Include assets smarter way
Regenerate ui
Merge pull request #35 from avakhov/12-smarter-assets

12 smarter assets