Some updated views and stuff