Updated views and shit