UI tweak: Flash name first
Strip useless code