Views are linked
Added more functionality