Ios7 tweaks

@andymoe, here are the proposed changes for iGCS-71. Could you please run this in the iOS6 and 7 sims and call out anything obvious I might have missed UI-wise?  

(there's a couple of behaviour related issues I've logged in JIRA, but this should hopefully suffice for the UI tweaks)