Added nav menu + improved readability