Scrapping decorators in favour of fluid builders
Removed the decorator classes
Screen documentation