Improve performance and add style to navigation