Made some more UI stuff and some functionality