Added Navigation and Display Features