Begin implementing the navbar, plus a few coding improvements.