Work on styling and navigation