First cut at spiffing up the UI