Working on some css and some optimization of the js