Arrange Items via ContextMenu and a few fixes...