UI and stability updates (need to fix source stuff next)