- layouts added
- minor changes and reorganization