more ui changes

making everything safe