implement better header and fix row cls css