font style change and other fix related