added layer lock, improved selection move/merge