(amend) Select current layer when it changes or is pressed
Small cleanup