updated styles
merged changes again