Improved and fixed css class maker