Modify layout
Add file handling