updated xs navbar_custom ui
Merge branch 'master' into kingman