refactor builder layout

refactor builder layout to have same theme/layout as Core/More,
depending on which builder is being navigated.
Merge pull request #103 from SergioCrisostomo/use-same-layout-for-builder

refactor builder layout