Styles n bugfixin