some rework on views & added two controllers