Remove spork, tweak ui