Fleshed out views a little bit more