base naming conventions around states; fix strange jumbotron nesting