cleaned up base and homepage to meet spec.