Remove inn, tweak UI