map up, ui reorganization