Lot of styling fixes done