Some views and updates - wip