Remove <ul> and <li> in <nav> and updated some link text