Bugfixing: User Control, Changed back to old Navigation