Merge redesign from dev to master.