Refactored layer elements
Merge pull request #1 from greendemiurge/Refactoring-form-elements

Refactored layer elements