Fixed all the bugs that came from Laura and Roxann
Made changes wherever necessary
This code is pre-iPhone 5 code (not optimized for i5)
Signed-off-by: harsco <mnimishakavi@harsco.com>