Made the ui work better, have to incorporate real functions monday