Arrows and gui fixes

Fixes #987