resturcture some things and connect data to views