added a buggy navigation, some more stuff