navigation optimisation + comment link fix + code style expand