Refactored and simplified the views. Todo: get the form record permissions tests to pass again.