Minor performance and layout improvements

Guest shared this idea a year ago