kim merged quang css to kim branch