Fix home layout and routing