fixed navoffset value and cleanup