Next iteration, better visual feedback and file browser