Fix render on load
Show current filename in all cases