Additional Layer Clean Up

Additional layers allow upper and lower level elements be moved
together (allows "random" vertical separation of the two levels of the
layout).  Other misc clean up.