updated xs navbar_custom ui
fixed ui bug
updated alerts to include alert links
updated ui
merge master, resolved conflict