Resolve CSS conflict issues & Test finished