Added arrow on main + fix