Refactored layer elements