Arc feature layout changes

Juggling of files - there should be no look and feel changes.