fixed some bugs and a nice cleanup on main styles done!