Minor styling changes, bug fix in nav macro.