Armada Way and West End also set for regeneration