Added another page, cleaned up code