Added layout
Add modulare app support