Style's adjustment and some minor updates