Make the UI less buggy