change gridviews and refactor names