General tweaks to layout and content