Fixes a bug with the app layout and yielding to sub pages.
Move formatting changes.