fixed formatting and navigation