updated styles due to bad merge