fixing stuff
resolve merge
fixing views