final changes-1, clean up&css