navigation super good
conflicts resolved
some padding issues fixed