fixes for ui and js