Added sub-menu items and select current page in mobile menu.

Also included a couple of cleanup commits.