New Styles & a little bit bug-fixing