Prettied Up

Some extension of logic, more error checking, but mostly getting the
page layout to look all right