fixing cs and some design