Switch order of views - easier to read pull request diff