Read from file
Add layout
Small fixes