Various cleanups to UI