Add some style touch by @anttti