tightening up ui so nothing is quite broken