fixed formatting and nvigation