Fixed up UI hookup
Final ui tweaks to make the UI hook up correctly