Cleaned up a little and changed page titles to reflect the pages