implement maps ui
padding
wip
fixed merge conflict