Updated with AutoLayout and new graphics / colors