Big update to css and to html structure