Minor updates

Added support for Left and Right Top Nav menus and some minor style and
organization changes.