Add nav menu
Fix layout positioning issue caused by border