Cleaned up arrow adjustment