Big update

design, views, structure etc