refactor views slightly