Added maps to views
git fix orgctrl
merge orgcntrl