Removing spans and resolving menu problems