Fixed the UI, mostly...