Updated views with fixes