ui and other fixes