Fix positioning + arrows