Rename nav and blocknav to lineup and blocklineup

Close #11