Added view and a couple of more details