Rearrange the project a bit.
Be a little tidier when setting the content view.