Improved some style features