Improve the speed on windows 7 and Mint layout