Anazon links done and cleanup of context menu
Updates for B5