now working on iPhone4s.  Layout changes