rework on views, make it start to work