Still trying to improve user experience

The previous commit is a simple way to boost up the score for user
experience, but pulls down the score for mobile speed.