Tightening the UI builder; it works welllll