arrows fix and form redesign