refactoring all layer browsers