added views and stuff