Updated views a bit