Minor changes
Store layer id
Push to layer rename