Merge redesign into master