updated styles
merged w master