Added navigation icons
Added basic mapping