Added UI fixes for ie 6-8 and merge