added and reorganized more ui elements