complete css redesign and logic change