[#805] include some css changes from @loicsans and wip in adapting the html structure