Things are a little smoother UI wise