fixed more ui elements
removed old code