Remove redundant `u-block`
Tidy up
Separate outer layout from `links-nav` component