Fix css style and more