Cleaned up pages and some navigation