Pulled in new Material changes and reworking root page