[TASK] Bootstrap menu rewrite and cleanup taking care of "spacers"