General style update

Prepared for preview