simplifying markup
Converting styles to sass
update navigation links