unsubscribe and layout tweaks