add tools to select / deselect current layer

clean up sort orders of layer and block actions