Design updtae and html/css cleaning