Major Revision - 14 April

Added more elements/styling.  Still a few positioning issues to be
corrected.