Added lot of changes for styles