tweaked layout and media scanning