arrow fix
arrow alignment
merge conflict in main.css and script.js