refactored views so they are easier to update
bumping version