More work on separting out interface elements for multi-document support