Move creation of all of the UI back to buildUi due to segfaults
Minor cleanup