General cleanup of the UI activities