Begin redesign integration
Updates to and integration of redesign
Finishing redesign work. To be merged to master shortly.