UI improvements
Merging files