Tidy up markup.
Fix markup.
Link to Nup84 model.