Added tabs and prepped for tablet plus layouts.