405 focus area

(see individual commits for details)
fixes focus area update issue
begins the process of refactor to browse migrate to top level