Ignore backup files
small UI changes
Merge