Fixed formating and phonegap issues