Fix markup
Fix title
More layout improvements