added some navigation and custom matrices