Ryan's 4/20/13 new layout updates