mobile nav
merge in angelo waves
wave styles and new map icon