Updated styles.
Fixed merge conflict.