added organization (tab and page) and fixed maps