Separating styles to better match template needs
Style reorganizing