updated styles
still cleaning up merge