Added modal, view is ok now. Missing charts etc...