READY TO MERGE - Updating styles

READY TO MERGE - updating styles