Added mouse
added tab nav mappings
merge