Update xibs for ios 7 & Bug fixes