Tweaked views to remove data that's not needed.

Also renamed the ids to prevent conflicts.