Revamp Style Support and padding