Added catch all path so that /express can be rendered properly. Along with that, added layoutProvider that will help swapping layout easily.