moved around ui stuff
more todos