Updated layout to show only filename not full path
Removed unused code.