Cleanup of the UI so that it looks better