UI re-done to be in screen space

Also some refactoring.