Refactor architecture + new pages in BBL Developer Toolset