Re-instating Toms menu changes