Added layering functionality, refactored deselection