Finalizing basic redesign and routing stuff