Updated markup
Fixed Nav