Cleaned up pages