Styles changed a bit to improve fitting