Slight cleanup and UI changes