More Layout Updates and dynamic navigation

please move this to CurrentPath and rename it to controller_klass_to_path