Added partner 'bondt' +
working on navigation, works fine on mac.
TO DO: Fix Windows