cleaned up redundant code, changed views so they are more consistent