Improvements to style, add navigation