Refactored to multimodule
tidy up, add bootstrap and other styles