Fixed inifinite loop & styling changes