ElementBox and ElementButton implemented
Merge branch 'nick'