Beefing up the UI