Added title, reworked nav