vuln fix
merge conflicts
Updated styles