refactor builder layout

refactor builder layout to have same theme/layout as Core/More,
depending on which builder is being navigated.