Minor bugfix where current mapping sometimes was not updated
Working menus (except indexing is wrong with new visual elements)