Tablet redesign a

Updating master ahead of push to Heroku.