styles organization and minor updates