Added views, and some fixes