Changed code for layout
- added id to layouts