Added more support to the Navigation Panel
also added the selection panel