Update project to ios7 & sort some horrendous layout annoyances