Checkpoint: Completely reorganizing UI (not finished). Will fix tests when finished.