More updates to styling
merge conflict