More styling changes
merged rahul's changes