new ui and fixes