html stuff moved to module

+ changed design