Update to new styling using Yogesh's design