Code cleaned up, tests are passing again, removed planned but unused code, ui looks decent now