some clean up and fixed icon problem in iphone 5