Updated some css and functionality