Fixed: Minor js and visual mods@