Add heading
More layout tweaks