ui and js fixes