Changes for restyling (Phase 2  Round 1,2)