clean up, tweak nav rows, fix object panel rows